Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

tspiteri and others added 14 commits December 19, 2019 17:57
doc: minus (U+2212) instead of dash (U+002D) for negative infinity

The documentation for [`f32::NEG_INFINITY`](https://doc.rust-lang.org/std/f32/constant.NEG_INFINITY.html) contains “-∞” with a dash instead of a minus sign, “−∞” with a proper minus sign looks better with the used Source Serif Pro font. Similarly for [`f64::NEG_INFINITY`](https://doc.rust-lang.org/std/f64/constant.NEG_INFINITY.html).
Move the region_scope_tree query to librustc_passes.

Split out of rust-lang#67688.

r? @Zoxc
Add error code explanation for E0477

Part of rust-lang#61137
Support `-Z ui-testing=yes/no`

`ui-testing` is now a boolean option (`-Z ui-testing=yes/no`) and can be specified multiple times with later values overriding earlier values (`-Z ui-testing=yes -Z ui-testing=no` == `-Z ui-testing=no`), so it can be set in a hierarchical way, e.g. UI testing infra may enable it by default with specific tests being able to opt-out.

This way we can remove the special opt-out support from `compiletest`.

Inspired by rust-lang#67709.
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Dec 31, 2019
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

📌 Commit 529a42a has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 31, 2019
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

⌛ Testing commit 529a42a with merge 5095101...

bors added a commit that referenced this pull request Dec 31, 2019
Rollup of 5 pull requests

Successful merges:

 - #67430 (doc: minus (U+2212) instead of dash (U+002D) for negative infinity)
 - #67697 (Move the region_scope_tree query to librustc_passes.)
 - #67719 (Add self to .mailmap)
 - #67723 (Add error code explanation for E0477)
 - #67735 (Support `-Z ui-testing=yes/no`)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 5095101 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2019
@bors bors merged commit 529a42a into rust-lang:master Dec 31, 2019
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-7f9v4nx branch January 3, 2020 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants